*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18664fdaa901dc4a13ed12cb044b0e55e9ffb81c..abd1cdcda25205acbfd98d982f16e493905e09dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * ediff-ve.el (noninteractive): Don't load generic-sc on MS-DOS
+       systems without long file-name support.
+
 2001-01-06  Andrew Innes  <andrewi@gnu.org>
 
        * makefile.w32-in (custom-deps): Set EMACSLOADPATH explicitly.